Removed the only listed bug :)
Merge branch 'dev'