Merge pull request #25 from oneski/master

minor changes again....