Merge Request #13 Conflicts resolved

acardenas Merge Request #13 Conflicts resolved