updated pull request for issue #16



<!---
@huboard:{"order":6.625}
-->