Hotfix/0.3.4

Update 8/1/2014