Merge pull request #14 from Zemistr/master

Merged with tchapi/Nestable and added some new features
Merge pull request #1 from RamonSmit/master

Merge pull request #14 from Zemistr/master