Issues/4

Test pull request from jonzerstyle fork.