Merge pull request #1 from ni-c/master