Merge pull request #6 from triangular/devel

Devel: Upgrade inner functionality