bugfix
bugfix
Merge pull request #3 from aaronkl/master

bugfixes