Merge pull request #29 from pmundkur/devel