Merge pull request #47 from BlackNoxis/experimental

Experimental
Merge pull request #50 from BlackNoxis/master

Merge pull request #47 from BlackNoxis/experimental