Merge pull request #2 from techdivision/master

Remerge ...
Merge pull request #11 from wagnert/master

Merge pull request #2 from techdivision/master