Merge tag '201410151543' into develop

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