Version bump and pulled commits from @nitriques integration branch.