Merge pull request #5 from holymoly/master

Update devel branch