Merge pull request #14 from leozhad/master

Merge from master
Merge pull request #15 from leozhad/kahless

Merge pull request #14 from leozhad/master