Merge pull request #21 from tdt/development

Fix #20
Merge pull request #26 from tdt/development

Fix #25
Issue #24$
Merge branch 'master' of github.com:tdt/triples
Issue #23