Merge pull request #3 from Free-Lancing/Development

Added new functionality