Merge pull request #17 from shabda/master

Linked to eldarion-ajax
Merge remote-tracking branch 'upstream/master'