Merge pull request #333 from Starli0n/master

Add three features