Merge pull request #14 from Zemistr/master

Merged with tchapi/Nestable and added some new features