Bug Fixing
Merge pull request #17 from thePlasm/master

Bug Fixing