More improvements- especially syntax.
Merge pull request #26 from smeggingsmegger/master

More improvements- especially syntax.