major changes
Merge pull request #276 from KodeKracker/master

major changes