Assisting @tzcoolman with pull request Scilifelab/facs/#29

@tzcoolman, those are some of the changes I would have liked to see in your pull request after I reviewed them, please, merge them in in your branch.