Merge branch 'master', remote-tracking branch 'origin'
Updated documention for features introduced in pull request #12
Merge pull request #14 from fbrnc/master

Updated documention for features introduced in pull request #12