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

PR 25 merged by jesus-garcia and js-gartox at Wed Dec 17 2014 01:36:42 GMT-0600 (CST)