Merge pull request #1 from tworzenieweb/master

Another bunch of improvements.
Merge pull request #2 from tworzenieweb/alpha

Another bunch of improvements.
Merge pull request #3 from tworzenieweb/master

added missing prototype methods
Merge pull request #4 from tworzenieweb/2.3-develop

2.3 develop