fixed stuff
Merge origin/master