Merge pull request #13 from DevelopmentPractice201405/master