Just a commit to keep up with changes
Merge remote-tracking branch 'origin/butterflyknife' into dev
Another Commit to add some stuff to the install file and a couple of other needed changes nothing big here.
Merge pull request #19 from lilfade/butterflyknife

Butterflyknife