Merge pull request #1 from geekles/master

Merge these changes in
Merge pull request #2 from geekles/master

Latest changes.
Merge pull request #3 from geekles/master

Latest changes
Fixes #258
Fixes #161
Merge pull request #264 from kempenk/master

Text Changes