Almost done
Merge pull request #46 from HSkogmo/master

Almost done