Merged in content from upstream
Merge pull request #11 from androm3da/master

Added test cases for additional coverage