Merge pull request #4 from AAROC/master

Full features.