Merge pull request #11 from nldn/master

1