Merge pull request #4 from pmundkur/devel