FIX: const correctness
Merge pull request #59 from arneboe/master

Fixed const correctness
Merge pull request #60 from retuxx/bootstrap

Simple script for bootstrapping
Merge branch 'upstream/master'