Merge pull request #12 from egineering-llc/issue_10

Issue 10