Fixes for Early Augest 2014
Merge pull request #189 from HIGHWAY99/master

Fixes for Early Augest 2014