Merge pull request #1 from f0rkz/master

update to most recent changes from forkz
Merge pull request #16 from swangy/master

Merge pull request #2 from f0rkz/master