First pull request

This is the first, just to see.. :)
I guess we can remove these few lines; it is an artifact from the original AS code