Merge pull request #159 from adamarla/master

Punched a hole for now to get feedback comments, to be secured later
Merge pull request #160 from adamarla/master

a bug with the last code that was pushed
Merge pull request #161 from adamarla/master

mff... this is not java
Merge remote-tracking branch 'upstream/master'