stable commit
Merge pull request #2 from duncan-wong/development-backup

stable commit