Merge pull request #1 from HypatiaStation/master

Repo update.
Bug Fixes.

Fixes for #97, #87 and other minor fixes.
Revert "Bug Fixes."

This reverts commit ce4522f177848e3aece0d079de9f578c33f1f963.
Bug Fixes.

#97, #87 and other minor bugs, solved.
Merge pull request #100 from Juani2400/master

Bugfixes.