some more changes
Merge pull request #2 from konstin/master

Merge more of konstin's changes.