Cleaned code. Test case created but not implemented yet.
Merge remote-tracking branch 'origin/master'