Merge pull request #4 from ichikaway/feature-3

Feature 3-2
aa