Merge pull request #16 from karlito139/develop

Removed the unmerged parts.