Merge pull request #20 from snakerock/master

BIG BIG MERGE
some improvements