Fixed Issue #7

Fixed Issue #8
Version bumped
Merge branch 'release/201411250829'
Merge tag '201411250829' into develop

Version 201411250829 201411250829