:prready:
Merge pull request #23 from gartox/test1

PR 23 merged by jesus-garcia and js-gartox at Tue Dec 16 2014 18:48:38 GMT-0600 (CST)