Merge branch 'release/2014_08-07-1'
Merge tag '2014_08-07-1' into develop

0.0.6