fixed some aliasing problems
Merge branch 'master' of github.com:aleksandarmilicevic/arby