refactoring and fixing minor issues
Merge pull request #4 from maloi/master

refactoring and fixing minor issues
Merge pull request #14 from blotter/master

refactoring and fixing minor issues