fix for issue0
Fix to issue01
Merge branches 'issue' and 'issue1' into dev_1.0
Fix to issue2
Immediate solution to issue2
Merge pull request #1 from ChristianLazatin/dev_1.0

Dev 1.0