Merge pull request #4 from dedeckeh/master
authorsbyx <steven@midlink.org>
Tue, 10 Dec 2013 14:52:57 +0000 (06:52 -0800)
committersbyx <steven@midlink.org>
Tue, 10 Dec 2013 14:52:57 +0000 (06:52 -0800)
Bugfixes


Trivial merge