Merge tag '201410170955' into develop

Version 201410170955 201410170955
Some updates
Version bumped
Merge branch 'release/201410170959'