Merge pull request #23 from spderosso/master

Some changes, more to come
explain ++