commit 18-08
Merge pull request #1 from royalist/master

commit 18-08