Fixed Issue#6
Merge branch 'develop' of https://github.com/MitchelCabuloy/SATS into develop