Improving the code and fixing some bugs#1

Merged

philipithomas merged 3 commits intophilipithomas:masterfrom campoy:master

Jul 20, 2016

+116-157

Commits on Jul 20, 2016

improve code
Francesc Campoy
committed
later improvements
Francesc Campoy
committed
last improvements
Francesc Campoy
committed