Clean the code and make it more clear
Merge pull request #193 from sidschingis/master

new
Merge pull request #192 from Psyker/master

Clean the code and make it more clear
Merge remote-tracking branch 'upstream/master'
new