Major bugfix
Major bugfix
Merge pull request #3 from krodyrobi/master

pull