more updates
Merge pull request #15 from brack/master

more fixes