Merge pull request #25 from EyNuel/development

Version 1.3 has been completed and can be merged into stable.
began development of version 1.4