Same features as previous commit with minor bug fixes.
Same features as previous commit with minor bug fixes.
Same features as previous commit with minor bug fixes.
Same features as previous commit with minor bug fixes.
Same features as previous commit with minor bug fixes.
Merge branch 'master' of https://github.com/Magmoz/galaxy